Merge from trunk
authorJan D. <jan.h.d@swipnet.se>
Wed, 20 Jan 2010 06:28:33 +0000 (07:28 +0100)
committerJan D. <jan.h.d@swipnet.se>
Wed, 20 Jan 2010 06:28:33 +0000 (07:28 +0100)
commit906726a98c41cd393f0a87c0c1a8da7871fdf178
tree60a1ac5470bce5ec443ad993c3aa65c5a8ab536b
parentb3bfc244929118e7ad373551b188d435c54548e5
parentf8314a59a0074e668c431b1e73281269a2df1d2d
Merge from trunk